<!DOCTYPE html>
<html lang="en-US">
  <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width,initial-scale=1">
    <title>协同开发 | 项目实战</title>
    <meta name="generator" content="VuePress 1.7.1">
    
    <meta name="description" content="">
    
    <link rel="preload" href="/project-word/assets/css/0.styles.441b7c55.css" as="style"><link rel="preload" href="/project-word/assets/js/app.1efb13a5.js" as="script"><link rel="preload" href="/project-word/assets/js/3.c7d8034a.js" as="script"><link rel="preload" href="/project-word/assets/js/4.8b7e9d4a.js" as="script"><link rel="prefetch" href="/project-word/assets/js/10.047575f2.js"><link rel="prefetch" href="/project-word/assets/js/11.5b2b793a.js"><link rel="prefetch" href="/project-word/assets/js/12.6ca56317.js"><link rel="prefetch" href="/project-word/assets/js/2.dba62a78.js"><link rel="prefetch" href="/project-word/assets/js/5.3eab7b4c.js"><link rel="prefetch" href="/project-word/assets/js/6.ce8a1920.js"><link rel="prefetch" href="/project-word/assets/js/7.26f952ac.js"><link rel="prefetch" href="/project-word/assets/js/8.9855f330.js"><link rel="prefetch" href="/project-word/assets/js/9.8a12a50d.js">
    <link rel="stylesheet" href="/project-word/assets/css/0.styles.441b7c55.css">
  </head>
  <body>
    <div id="app" data-server-rendered="true"><div class="theme-container"><header class="navbar"><div class="sidebar-button"><svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" role="img" viewBox="0 0 448 512" class="icon"><path fill="currentColor" d="M436 124H12c-6.627 0-12-5.373-12-12V80c0-6.627 5.373-12 12-12h424c6.627 0 12 5.373 12 12v32c0 6.627-5.373 12-12 12zm0 160H12c-6.627 0-12-5.373-12-12v-32c0-6.627 5.373-12 12-12h424c6.627 0 12 5.373 12 12v32c0 6.627-5.373 12-12 12zm0 160H12c-6.627 0-12-5.373-12-12v-32c0-6.627 5.373-12 12-12h424c6.627 0 12 5.373 12 12v32c0 6.627-5.373 12-12 12z"></path></svg></div> <a href="/project-word/" class="home-link router-link-active"><!----> <span class="site-name">项目实战</span></a> <div class="links"><div class="search-box"><input aria-label="Search" autocomplete="off" spellcheck="false" value=""> <!----></div> <!----></div></header> <div class="sidebar-mask"></div> <aside class="sidebar"><!---->  <ul class="sidebar-links"><li><a href="/project-word/01-项目介绍.html" class="sidebar-link">项目介绍</a><ul class="sidebar-sub-headers"><li class="sidebar-sub-header"><a href="/project-word/01-项目介绍.html#项目介绍" class="sidebar-link">项目介绍</a><ul class="sidebar-sub-headers"><li class="sidebar-sub-header"><a href="/project-word/01-项目介绍.html#_01-项目背景" class="sidebar-link">01-项目背景</a></li><li class="sidebar-sub-header"><a href="/project-word/01-项目介绍.html#_02-产品介绍" class="sidebar-link">02-产品介绍</a></li><li class="sidebar-sub-header"><a href="/project-word/01-项目介绍.html#_03-功能介绍" class="sidebar-link">03-功能介绍</a></li></ul></li></ul></li><li><a href="/project-word/02-项目需求.html" class="sidebar-link">项目需求</a><ul class="sidebar-sub-headers"><li class="sidebar-sub-header"><a href="/project-word/02-项目需求.html#项目需求" class="sidebar-link">项目需求</a><ul class="sidebar-sub-headers"><li class="sidebar-sub-header"><a href="/project-word/02-项目需求.html#_01-基础题库" class="sidebar-link">01-基础题库</a></li><li class="sidebar-sub-header"><a href="/project-word/02-项目需求.html#_02-精选题库" class="sidebar-link">02-精选题库</a></li><li class="sidebar-sub-header"><a href="/project-word/02-项目需求.html#_03-试题录入" class="sidebar-link">03-试题录入</a></li><li class="sidebar-sub-header"><a href="/project-word/02-项目需求.html#_04-题组管理" class="sidebar-link">04-题组管理</a></li><li class="sidebar-sub-header"><a href="/project-word/02-项目需求.html#_05-学科管理" class="sidebar-link">05-学科管理</a></li><li class="sidebar-sub-header"><a href="/project-word/02-项目需求.html#_06-目录管理" class="sidebar-link">06-目录管理</a></li><li class="sidebar-sub-header"><a href="/project-word/02-项目需求.html#_07-标签管理" class="sidebar-link">07-标签管理</a></li><li class="sidebar-sub-header"><a href="/project-word/02-项目需求.html#_08-面试技巧" class="sidebar-link">08-面试技巧</a></li></ul></li></ul></li><li><a href="/project-word/03-项目接口.html" class="sidebar-link">接口文档</a><ul class="sidebar-sub-headers"><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_01-框架" class="sidebar-link">01-框架</a><ul class="sidebar-sub-headers"><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_1-1用户修改密码" class="sidebar-link">1.1用户修改密码</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_1-2用户注册" class="sidebar-link">1.2用户注册</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_1-3用户注销" class="sidebar-link">1.3用户注销</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_1-4用户登录" class="sidebar-link">1.4用户登录</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_1-5用户资料" class="sidebar-link">1.5用户资料</a></li></ul></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_02-用户管理" class="sidebar-link">02-用户管理</a><ul class="sidebar-sub-headers"><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_2-1用户修改" class="sidebar-link">2.1用户修改</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_2-2用户列表" class="sidebar-link">2.2用户列表</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_2-3用户删除" class="sidebar-link">2.3用户删除</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_2-4用户屏蔽、启用" class="sidebar-link">2.4用户屏蔽、启用</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_2-5用户添加" class="sidebar-link">2.5用户添加</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_2-6用户简单列表" class="sidebar-link">2.6用户简单列表</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_2-7用户详情" class="sidebar-link">2.7用户详情</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_2-8用户重置密码" class="sidebar-link">2.8用户重置密码</a></li></ul></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_03-菜单管理" class="sidebar-link">03-菜单管理</a><ul class="sidebar-sub-headers"><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_3-1菜单修改" class="sidebar-link">3.1菜单修改</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_3-2菜单列表" class="sidebar-link">3.2菜单列表</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_3-3菜单删除" class="sidebar-link">3.3菜单删除</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_3-4菜单添加" class="sidebar-link">3.4菜单添加</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_3-5菜单详情" class="sidebar-link">3.5菜单详情</a></li></ul></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_04-权限组管理" class="sidebar-link">04-权限组管理</a><ul class="sidebar-sub-headers"><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_4-1权限组修改" class="sidebar-link">4.1权限组修改</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_4-2权限组列表" class="sidebar-link">4.2权限组列表</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_4-3权限组删除" class="sidebar-link">4.3权限组删除</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_4-4权限组添加" class="sidebar-link">4.4权限组添加</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_4-5权限组简单列表" class="sidebar-link">4.5权限组简单列表</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_4-6权限组详情" class="sidebar-link">4.6权限组详情</a></li></ul></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_05-企业管理" class="sidebar-link">05-企业管理</a><ul class="sidebar-sub-headers"><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_5-1企业管理修改" class="sidebar-link">5.1企业管理修改</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_5-2企业管理列表" class="sidebar-link">5.2企业管理列表</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_5-3企业管理删除" class="sidebar-link">5.3企业管理删除</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_5-4企业管理添加" class="sidebar-link">5.4企业管理添加</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_5-5企业管理设置状态" class="sidebar-link">5.5企业管理设置状态</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_5-6企业管理详情" class="sidebar-link">5.6企业管理详情</a></li></ul></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_06-题库管理" class="sidebar-link">06-题库管理</a><ul class="sidebar-sub-headers"><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_6-1审核意见" class="sidebar-link">6.1审核意见</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_6-2出题记录" class="sidebar-link">6.2出题记录</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_6-3基础题库列表" class="sidebar-link">6.3基础题库列表</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_6-4基础题库删除" class="sidebar-link">6.4基础题库删除</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_6-5基础题库添加" class="sidebar-link">6.5基础题库添加</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_6-5基础题库详情" class="sidebar-link">6.5基础题库详情</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_6-6基础题库修改" class="sidebar-link">6.6基础题库修改</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_6-7批量导入题" class="sidebar-link">6.7批量导入题</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_6-8精选题库上下架" class="sidebar-link">6.8精选题库上下架</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_6-9精选题库列表" class="sidebar-link">6.9精选题库列表</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_6-10组题列表" class="sidebar-link">6.10组题列表</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_6-11组题列表删除" class="sidebar-link">6.11组题列表删除</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_6-12加入或移出精选" class="sidebar-link">6.12加入或移出精选</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_6-13试题审核" class="sidebar-link">6.13试题审核</a></li></ul></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_07-学科管理" class="sidebar-link">07-学科管理</a><ul class="sidebar-sub-headers"><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_7-1标签添加" class="sidebar-link">7.1标签添加</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_7-2学科修改" class="sidebar-link">7.2学科修改</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_7-3学科删除" class="sidebar-link">7.3学科删除</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_7-4学科添加" class="sidebar-link">7.4学科添加</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_7-5学科简单列表" class="sidebar-link">7.5学科简单列表</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_7-6学科详情" class="sidebar-link">7.6学科详情</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_7-7标签修改" class="sidebar-link">7.7标签修改</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_7-8标签列表" class="sidebar-link">7.8标签列表</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_7-9标签删除" class="sidebar-link">7.9标签删除</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_7-10学科列表" class="sidebar-link">7.10学科列表</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_7-11标签状态" class="sidebar-link">7.11标签状态</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_7-12标签详情" class="sidebar-link">7.12标签详情</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_7-13目录修改" class="sidebar-link">7.13目录修改</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_7-14目录列表" class="sidebar-link">7.14目录列表</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_7-15目录删除" class="sidebar-link">7.15目录删除</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_7-16目录添加" class="sidebar-link">7.16目录添加</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_7-17目录状态" class="sidebar-link">7.17目录状态</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_7-18目录详情" class="sidebar-link">7.18目录详情</a></li></ul></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_08-面试技巧" class="sidebar-link">08-面试技巧</a><ul class="sidebar-sub-headers"><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_8-1文章列表" class="sidebar-link">8.1文章列表</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_8-2文章删除" class="sidebar-link">8.2文章删除</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_8-3文章添加" class="sidebar-link">8.3文章添加</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_8-4文章状态" class="sidebar-link">8.4文章状态</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_8-5文章编辑" class="sidebar-link">8.5文章编辑</a></li><li class="sidebar-sub-header"><a href="/project-word/03-项目接口.html#_8-6文章详情" class="sidebar-link">8.6文章详情</a></li></ul></li></ul></li><li><a href="/project-word/04-协同开发.html" class="active sidebar-link">协同开发</a><ul class="sidebar-sub-headers"><li class="sidebar-sub-header"><a href="/project-word/04-协同开发.html#协同开发" class="sidebar-link">协同开发</a><ul class="sidebar-sub-headers"><li class="sidebar-sub-header"><a href="/project-word/04-协同开发.html#git工作流程" class="sidebar-link">Git工作流程</a></li><li class="sidebar-sub-header"><a href="/project-word/04-协同开发.html#_01-项目开始-组长" class="sidebar-link">01-项目开始（组长）</a></li><li class="sidebar-sub-header"><a href="/project-word/04-协同开发.html#_02-开发阶段" class="sidebar-link">02-开发阶段</a></li><li class="sidebar-sub-header"><a href="/project-word/04-协同开发.html#_03-测试阶段" class="sidebar-link">03-测试阶段</a></li><li class="sidebar-sub-header"><a href="/project-word/04-协同开发.html#_04-分支流程参考" class="sidebar-link">04-分支流程参考</a></li></ul></li></ul></li><li><a href="/project-word/05-项目部署.html" class="sidebar-link">项目部署</a><ul class="sidebar-sub-headers"><li class="sidebar-sub-header"><a href="/project-word/05-项目部署.html#项目部署" class="sidebar-link">项目部署</a><ul class="sidebar-sub-headers"><li class="sidebar-sub-header"><a href="/project-word/05-项目部署.html#项目打包" class="sidebar-link">项目打包</a></li><li class="sidebar-sub-header"><a href="/project-word/05-项目部署.html#前端部署" class="sidebar-link">前端部署</a></li></ul></li></ul></li></ul> </aside> <main class="page"> <div class="theme-default-content content__default"><h2 id="协同开发"><a href="#协同开发" class="header-anchor">#</a> 协同开发</h2> <h3 id="git工作流程"><a href="#git工作流程" class="header-anchor">#</a> Git工作流程</h3> <p><img src="/project-word/assets/img/1590327475945.fe6146da.png" alt="1590327475945"></p> <p><img src="/project-word/assets/img/1590328013676.15055ec1.png" alt="1590328013676"></p> <p><img src="" alt="1590328101993"></p> <h3 id="_01-项目开始-组长"><a href="#_01-项目开始-组长" class="header-anchor">#</a> 01-项目开始（组长）</h3> <h5 id="_1-复制项目"><a href="#_1-复制项目" class="header-anchor">#</a> (1)复制项目</h5> <h5 id="_2-项目仓库"><a href="#_2-项目仓库" class="header-anchor">#</a> (2)项目仓库</h5> <ul><li>需要根据已有项目初始化属于自己小组的项目，创建不同代码分支。</li> <li>具体步骤：
<ul><li>删除项目中的 <code>.git</code> 文件夹</li> <li>初始化仓库 <code>git init</code></li> <li>添加暂存区 <code>git add .</code></li> <li>提交本地仓库 <code>git commit -m 项目初始化</code></li> <li>master分支创建release分支 <code>git branch release</code></li> <li>基于master分支创建develop分支 <code>git branch develop</code></li></ul></li></ul> <h5 id="_3-远程仓库"><a href="#_3-远程仓库" class="header-anchor">#</a> (3)远程仓库</h5> <ul><li>在码云上创建仓库</li></ul> <p><img src="/project-word/assets/img/1590329921665.82eddda1.png" alt="1590329921665"></p> <ul><li>拉入你小组成员</li></ul> <p>点击管理</p> <p><img src="" alt="1590330019281"></p> <p>点击仓库成员管理----&gt;点击开发者</p> <p><img src="/project-word/assets/img/1590330054047.377a01f5.png" alt="1590330054047"></p> <p>点击添加仓库成员-----&gt;点击邀请用户------&gt;点击直接添加</p> <p><img src="/project-word/assets/img/1590330191511.657ce378.png" alt="1590330191511"></p> <ul><li>此处可以搜索你的小组成员，点击添加一次性添加（此操作必须，否则无仓库操作权限）</li></ul> <h5 id="_4-推送所有分支"><a href="#_4-推送所有分支" class="header-anchor">#</a> (4) 推送所有分支</h5> <div class="language-bash extra-class"><pre class="language-bash"><code><span class="token comment"># 添加仓库地址别名  (仓库地址仅供参考)</span>
<span class="token function">git</span> remote <span class="token function">add</span> origin https://gitee.com/zhoushugang/hmmm-frontend-100-01.git
<span class="token comment"># 推送master分支</span>
<span class="token function">git</span> push -u origin master
<span class="token comment"># 推送release分支</span>
<span class="token function">git</span> push origin release
<span class="token comment"># 推送develop分支</span>
<span class="token function">git</span> push origin develop
</code></pre></div><h3 id="_02-开发阶段"><a href="#_02-开发阶段" class="header-anchor">#</a> 02-开发阶段</h3> <h5 id="_1-组员克隆项目"><a href="#_1-组员克隆项目" class="header-anchor">#</a> (1)组员克隆项目</h5> <div class="language-bash extra-class"><pre class="language-bash"><code><span class="token comment"># 在任意目录操作  (仓库地址仅供参考)</span>
<span class="token function">git</span> clone https://gitee.com/zhoushugang/hmmm-frontend-100-01.git
<span class="token comment"># 拉取其他分支</span>
<span class="token function">git</span> fetch git@gitee.com:zhoushugang/hmmm-frontend-100-01.git release:release
<span class="token function">git</span> fetch git@gitee.com:zhoushugang/hmmm-frontend-100-01.git develop:develop
</code></pre></div><ul><li>如果想要运行起来请参照 <a href="/project-word/04-项目环境.html">项目环境</a></li></ul> <h5 id="_2-创建任务分支"><a href="#_2-创建任务分支" class="header-anchor">#</a> (2)创建任务分支</h5> <div class="language-bash extra-class"><pre class="language-bash"><code><span class="token comment"># 切换到develop分支</span>
<span class="token function">git</span> checkout develop
<span class="token comment"># 例如创建基础题库分支   规范(feature/功能)</span>
<span class="token function">git</span> checkout -b feature/questions
</code></pre></div><ul><li>分支命名枚举
<ul><li><code>feature/questions</code>   基础题库</li> <li><code>feature/questions-choice</code>   精选题库</li> <li><code>feature/questions-new</code>   试题录入</li> <li><code>feature/randoms</code>   题组列表</li> <li><code>feature/subjects</code>  学科管理</li> <li><code>feature/directorys</code>  目录管理</li> <li><code>feature/tags</code>  标签管理</li> <li><code>feature/articles</code>  面试技巧</li></ul></li></ul> <h5 id="_3-进行开发"><a href="#_3-进行开发" class="header-anchor">#</a> (3)进行开发</h5> <ul><li>当你开发完成一个小功能需要提交代码</li></ul> <div class="language-bash extra-class"><pre class="language-bash"><code><span class="token comment"># 添加到暂存</span>
<span class="token function">git</span> <span class="token function">add</span> <span class="token builtin class-name">.</span>
<span class="token comment"># 提交本地仓库 （不需要推送到远程仓库）</span>
<span class="token function">git</span> commit -m <span class="token string">'备注'</span>
</code></pre></div><h5 id="_4-开发完毕"><a href="#_4-开发完毕" class="header-anchor">#</a> (4)开发完毕</h5> <ul><li>当你确认你的任务功能开发完毕后，合并到develop分支然后推送到远程</li></ul> <div class="language-bash extra-class"><pre class="language-bash"><code><span class="token comment"># 切换到develop分支</span>
<span class="token function">git</span> checkout develop
<span class="token comment"># 拉取最新develop分支（没有配置origin直接使用仓库地址）</span>
<span class="token function">git</span> pull origin develop
<span class="token comment"># 合并自己的任务分支   例如（featrue/questions）基础题库</span>
<span class="token function">git</span> merge featrue/questions
<span class="token comment"># 推送develop分支 （没有配置origin直接使用仓库地址）</span>
<span class="token function">git</span> push origin develop
</code></pre></div><h3 id="_03-测试阶段"><a href="#_03-测试阶段" class="header-anchor">#</a> 03-测试阶段</h3> <p>(1)拉取远程develop分支到本地进行测试</p> <blockquote><p>这个操作组长进行。</p></blockquote> <div class="language-bash extra-class"><pre class="language-bash"><code><span class="token comment"># 拉取最新的develop分支到本地</span>
<span class="token function">git</span> pull origin develop
<span class="token comment"># 合并到release分支</span>
<span class="token function">git</span> checkout release
<span class="token function">git</span> merge develop
<span class="token comment"># 推送合并完成的release分支到远程仓库</span>
<span class="token function">git</span> push origin release
</code></pre></div><ul><li>在本地进行测试，且在禅道指派bug 参照文档 <a href="/project-word/07-禅道BUG管理使用说明.html">禅道BUG管理使用说明</a></li></ul> <p>(2)组员收到指派的bug后创建修复分支进行修复</p> <blockquote><p>收到BUG的学员可以进行修复，如果不是你的BUG可指派给其他人。</p></blockquote> <ul><li>创建修改bug的分支</li></ul> <div class="language-bash extra-class"><pre class="language-bash"><code><span class="token comment"># 拉取最新的release分支</span>
<span class="token function">git</span> pull origin release
<span class="token comment"># 创建修改bug的分支   规范（hotfix/questions） 和开发分支命名一致功能命名</span>
<span class="token function">git</span> checkout -b hotfix/questions
</code></pre></div><ul><li>进行修复</li></ul> <div class="language-bash extra-class"><pre class="language-bash"><code><span class="token comment"># 添加暂存</span>
<span class="token function">git</span> <span class="token function">add</span> <span class="token builtin class-name">.</span>
<span class="token comment"># 提交本地</span>
<span class="token function">git</span> commit -m <span class="token string">'修改基础题库bug-分页错误'</span>
<span class="token comment"># 合并分支</span>
<span class="token function">git</span> checkout release
<span class="token function">git</span> merge hotfix/questions
<span class="token comment"># 拉取最新release分支</span>
<span class="token function">git</span> pull origin release
<span class="token comment"># 推送release分支</span>
<span class="token function">git</span> push origin release
</code></pre></div><p>(3)测试完毕</p> <blockquote><p>这个操作组长进行，或者代课老师操作。</p></blockquote> <div class="language-bash extra-class"><pre class="language-bash"><code><span class="token comment"># 拉取最新的develop分支到本地</span>
<span class="token function">git</span> pull origin release
<span class="token comment"># 合并到release分支</span>
<span class="token function">git</span> checkout master
<span class="token function">git</span> merge release
<span class="token comment"># 推送合并完成的release分支到远程仓库</span>
<span class="token function">git</span> push origin master
</code></pre></div><p>--------------------------------------END------------------------------------------------结束咧-----------------------------------------------------</p> <h3 id="_04-分支流程参考"><a href="#_04-分支流程参考" class="header-anchor">#</a> 04-分支流程参考</h3> <p><img src="/project-word/assets/img/1590333375935.9026f2e4.png" alt="1590333375935"></p> <p>对比我们的开发路线，我们是开发到测试到上线，所以和上图略有差异，所以上图仅供参考。</p></div> <footer class="page-edit"><!----> <!----></footer> <div class="page-nav"><p class="inner"><span class="prev">
      ←
      <a href="/project-word/03-项目接口.html" class="prev">
        接口文档
      </a></span> <span class="next"><a href="/project-word/05-项目部署.html">
        项目部署
      </a>
      →
    </span></p></div> </main></div><div class="global-ui"></div></div>
    <script src="/project-word/assets/js/app.1efb13a5.js" defer></script><script src="/project-word/assets/js/3.c7d8034a.js" defer></script><script src="/project-word/assets/js/4.8b7e9d4a.js" defer></script>
  </body>
</html>
